Manual merge.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 3 Jul 2005 22:36:48 +0000 (22:36 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 3 Jul 2005 22:36:48 +0000 (22:36 +0000)

Trivial merge